Change http to https, use args for all tests

diff --git a/build_deb.py b/build_deb.py
index 3f05c7454e1ffaac5cea04ebb864ccecc5d99ea0..dea06eb6eca9db7e526bd2cf2d444dd6db1f9a3b 100755 (executable)
--- a/build_deb.py
+++ b/build_deb.py
@@ -99,7 +99,7 @@ if __name__ == '__main__':
         archother={
             '32bit': 'i386',
             '64bit': 'x86_64'}[platform.architecture()[0]],
-        homepage='http://siridb.net',
+        homepage='https://siridb.net',
         distribution=_get_distribution(),
         curdate=datetime.datetime.utcnow().strftime('%d %b %Y'),
         year=datetime.datetime.utcnow().year,

diff --git a/debian/control b/debian/control
index 08be0c73920bd379840bc3245e21f974da55d16f..972974f1a449618a420dc6db938c253716c02fba 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 11),
                uuid-dev,
                libcleri-dev
 Standards-Version: 4.1.3
-Homepage: http://siridb.net
+Homepage: https://siridb.net
 Vcs-Browser: https://github.com/SiriDB/siridb-server
 Vcs-Git: https://github.com/SiriDB/siridb-server.git
 

diff --git a/debian/copyright b/debian/copyright
index cf2d830e83215aabb5ebba10ca02ea98a8167cce..958c37c442ab976a10f59fe8b2e34e1dd847bf6d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: siridb-server
-Source: http://siridb.net
+Source: https://siridb.net
 
 Files: *
 Copyright: 2016 Transceptor Technology

diff --git a/itest/test_buffer.py b/itest/test_buffer.py
index c3d387a05ddee0e4c82158d4722d83285f2a801e..e1c9d57bfaa7bc33470fcecae0c5d160085b0574 100644 (file)
--- a/itest/test_buffer.py
+++ b/itest/test_buffer.py
@@ -18,6 +18,7 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
 
 
 class TestBuffer(TestBase):
@@ -116,8 +117,5 @@ class TestBuffer(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'INFO'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestBuffer())

diff --git a/itest/test_cluster.py b/itest/test_cluster.py
index aab5369d25673a15166dc8b5639e898e91c8d965..8b47f79bcd219e1a1ae971a519263311eddae001 100644 (file)
--- a/itest/test_cluster.py
+++ b/itest/test_cluster.py
@@ -17,6 +17,7 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
 
 
 class TestCluster(TestBase):
@@ -65,8 +66,5 @@ class TestCluster(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'INFO'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestCluster())

diff --git a/itest/test_compression.py b/itest/test_compression.py
index 411dc10ea8cb60eb613a25b2351822b65ac29fbb..7579df27a029813cfadefe373e293059b2b8654a 100644 (file)
--- a/itest/test_compression.py
+++ b/itest/test_compression.py
@@ -17,6 +17,8 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
+
 
 TIME_PRECISION = 'ms'
 
@@ -119,8 +121,5 @@ class TestCompression(TestBase):
 
 if __name__ == '__main__':
     random.seed(1)
-    SiriDB.LOG_LEVEL = 'CRITICAL'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestCompression())

diff --git a/itest/test_group.py b/itest/test_group.py
index 3e07edf83518b779bc0d7c6303c2ff0ac97adbb0..e8c9915904b3beed751bdeb757fc99df410bd5b1 100644 (file)
--- a/itest/test_group.py
+++ b/itest/test_group.py
@@ -17,6 +17,7 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
 
 
 DATA = {
@@ -176,8 +177,5 @@ class TestGroup(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'CRITICAL'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestGroup())

diff --git a/itest/test_insert.py b/itest/test_insert.py
index d5c71ff5d37d3b472441df002b0ebc6436e2d020..592de753413e0dd20a806fa73780e9acbdb7aea4 100644 (file)
--- a/itest/test_insert.py
+++ b/itest/test_insert.py
@@ -17,6 +17,8 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
+
 
 TIME_PRECISION = 'ns'
 
@@ -187,8 +189,5 @@ class TestInsert(TestBase):
 
 if __name__ == '__main__':
     random.seed(1)
-    SiriDB.LOG_LEVEL = 'CRITICAL'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestInsert())

diff --git a/itest/test_list.py b/itest/test_list.py
index 5c6f9f22e9bbffe9b255eb7f776155b0fb7f6353..533ecf783057dfc71495f3a64cae76edaed8315b 100644 (file)
--- a/itest/test_list.py
+++ b/itest/test_list.py
@@ -17,6 +17,8 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
+
 
 TIME_PRECISION = 's'
 
@@ -107,8 +109,5 @@ class TestList(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'CRITICAL'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestList())

diff --git a/itest/test_log.py b/itest/test_log.py
index 9033aa32b61f837fb3b9b1bf386ad6f120854660..263d7dbb7b050c787c0e1b2eb7577c945c344a3e 100644 (file)
--- a/itest/test_log.py
+++ b/itest/test_log.py
@@ -17,6 +17,7 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
 
 
 DATA = {
@@ -249,8 +250,5 @@ class TestLog(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'CRITICAL'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestLog())

diff --git a/itest/test_pipe_support.py b/itest/test_pipe_support.py
index 37bf9ff6d5623f53d54a8ed910fa4a1f47011cac..8739c8fff13a747222fb499647d6175a3461337e 100644 (file)
--- a/itest/test_pipe_support.py
+++ b/itest/test_pipe_support.py
@@ -19,6 +19,8 @@ from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
 from testing import SiriDBAsyncUnixConnection
+from testing import parse_args
+
 
 PIPE_NAME = '/tmp/siridb_pipe_test.sock'
 
@@ -74,8 +76,5 @@ class TestPipeSupport(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'CRITICAL'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestPipeSupport())

diff --git a/itest/test_pool.py b/itest/test_pool.py
index 5e4bde9ef2a711d4976ab8ef5e0912b436210016..efbbadc6c18fa27830c1799c366cd8fe80bc93ff 100644 (file)
--- a/itest/test_pool.py
+++ b/itest/test_pool.py
@@ -17,6 +17,7 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
 
 
 class TestPool(TestBase):
@@ -94,8 +95,5 @@ class TestPool(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'CRITICAL'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestPool())

diff --git a/itest/test_series.py b/itest/test_series.py
index 42c6d750a6765e814fa85fe216507eece81e5ee9..716ffe535f20fb8f9a295b98219d6ec9dfc7f68d 100644 (file)
--- a/itest/test_series.py
+++ b/itest/test_series.py
@@ -17,6 +17,7 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
 
 
 PI = 'ԉ'
@@ -112,8 +113,5 @@ class TestSeries(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'CRITICAl'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestSeries())

diff --git a/itest/test_server.py b/itest/test_server.py
index 6ba410e7687841e8f750ae56c4aef0fd586e19a4..1a41af1f6337cba1372f279f0f49ffc0be6b2211 100644 (file)
--- a/itest/test_server.py
+++ b/itest/test_server.py
@@ -17,6 +17,7 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
 
 
 class TestServer(TestBase):
@@ -31,7 +32,7 @@ class TestServer(TestBase):
         await self.client0.connect()
 
         await self.db.add_pool(self.server1)
-        await self.assertIsRunning(self.db, self.client0, timeout=12)
+        await self.assertIsRunning(self.db, self.client0, timeout=20)
         await asyncio.sleep(5)
 
         await self.client1.connect()
@@ -149,8 +150,5 @@ class TestServer(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'CRITICAL'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestServer())

diff --git a/itest/test_syslog.py b/itest/test_syslog.py
index ae17878bf934107c0e13289b0b0d09f3fa907da0..734b576890446d6f90721540aff17f552d6b36a1 100644 (file)
--- a/itest/test_syslog.py
+++ b/itest/test_syslog.py
@@ -21,6 +21,8 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
+
 
 # Compression OFF:
 # du --bytes testdir/dbpath0/dbtest/shards/
@@ -86,8 +88,5 @@ class TestSyslog(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'CRITICAL'
-    Server.HOLD_TERM = True
-    Server.MEM_CHECK = True
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestSyslog())

diff --git a/itest/test_user.py b/itest/test_user.py
index 0015124ce93084759ffd0e0045d72c4e94a963cf..b60bc645f86314c74d4ae3da7adae79ebc101a56 100644 (file)
--- a/itest/test_user.py
+++ b/itest/test_user.py
@@ -17,6 +17,7 @@ from testing import ServerError
 from testing import SiriDB
 from testing import TestBase
 from testing import UserAuthError
+from testing import parse_args
 
 
 class TestUser(TestBase):
@@ -188,8 +189,5 @@ class TestUser(TestBase):
 
 
 if __name__ == '__main__':
-    SiriDB.LOG_LEVEL = 'CRITICAL'
-    Server.HOLD_TERM = False
-    Server.MEM_CHECK = False
-    Server.BUILDTYPE = 'Debug'
+    parse_args()
     run_test(TestUser())

diff --git a/itest/testing/task.py b/itest/testing/task.py
index 7f26bd63084d348fb02582aefb759c26c2502328..0a6f2564ee3fdf4414672bfde2e32979ada2a02c 100644 (file)
--- a/itest/testing/task.py
+++ b/itest/testing/task.py
@@ -33,4 +33,3 @@ class Task():
             print(
                 f'{self.title:.<76}'
                 f'{Color.error("FAILED")} ({self.duration:.2f} seconds)')
-